Show Room name in Desktop notification title if message is come from a chat room #19053
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
melvin-bot
bot
requested review from
Julesssss and
s77rt
and removed request for
a team
|
@Julesssss @s77rt One of you needs to copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] |
6 tasks
Julesssss
reviewed
May 17, 2023
s77rt
suggested changes
May 17, 2023
Comment on lines
109
to
110
| let title = ''; | ||
| let body = ''; |
There was a problem hiding this comment.
Suggested change
| let title = ''; | |
| let body = ''; | |
| let title; | |
| let body; |
NAB. No need to set a init value here.
| const {person, message} = reportAction; | ||
| const plainTextPerson = _.map(person, (f) => f.text).join(); | ||
| const isChatRoom = ReportUtils.isChatRoom(report); |
There was a problem hiding this comment.
NAB. Can you move this line to look like this just for clarity
const isChatRoom = ReportUtils.isChatRoom(report);
let title;
let body;There was a problem hiding this comment.
Is it a good idea if I move them to top? Basically, intepreter usually move declaration to the top too.
let title;
let body;
const isChatRoom = ReportUtils.isChatRoom(report);
const {person, message} = reportAction;
const plainTextPerson = _.map(person, (f) => f.text).join();
// Specifically target the comment part of the message
const plainTextMessage = (_.find(message, (f) => f.type === 'COMMENT') || {}).text;There was a problem hiding this comment.
Yes looks good. but add an empty line after isChatRoom and before the comment.
There was a problem hiding this comment.
pushReportCommentNotification({report, reportAction, onClick}, usesIcon = false) {
let title;
let body;
const isChatRoom = ReportUtils.isChatRoom(report);
const {person, message} = reportAction;
const plainTextPerson = _.map(person, (f) => f.text).join();
// Specifically target the comment part of the message
const plainTextMessage = (_.find(message, (f) => f.type === 'COMMENT') || {}).text;
if (isChatRoom) {
const roomName = _.get(report, 'displayName', '');
title = roomName;
body = `${plainTextPerson}: ${plainTextMessage}`;
} else {
title = plainTextPerson;
body = plainTextMessage;
}
push({
title,
body,
delay: 0,
onClick,
icon: usesIcon ? EXPENSIFY_ICON_URL : '',
});
},Just wanna clarify 1 more question. Do you think it too much empty line in this function? Or it looks good
There was a problem hiding this comment.
I have updated PR with our discussion above. Could you help to review them again? Thanks
Reviewer Checklist
Screenshots/VideosWeb
Mobile Web - ChromeMobile Web - SafariDesktop
iOSAndroid |
|
Lint should have failed as we have no empty line before this comment . Something is wrong with the linter. |
Does it mean we should an empty line before a comment? |
|
AFAIK Yes. |
s77rt
approved these changes
May 17, 2023
Julesssss
approved these changes
May 18, 2023
39 tasks
|
🚀 Deployed to staging by https://github.com/Julesssss in version: 1.3.16-2 🚀
|
|
🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.16-7 🚀
|
2 similar comments
|
🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.16-7 🚀
|
|
🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.16-7 🚀
|
|
🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.16-7 🚀
|
6 tasks
techievivek
reviewed
Oct 4, 2023
| const {person, message} = reportAction; | ||
| const plainTextPerson = _.map(person, (f) => f.text).join(); | ||
|
|
||
| // Specifically target the comment part of the message | ||
| const plainTextMessage = (_.find(message, (f) => f.type === 'COMMENT') || {}).text; | ||
|
|
||
| if (isChatRoom) { | ||
| const roomName = _.get(report, 'displayName', ''); |
There was a problem hiding this comment.
Does this need to be reportName? Because I can't see the displayName property. I was working on this PR #28200 (comment) and realized that the notifications for chat rooms might be broken for web and desktop?
There was a problem hiding this comment.
This is a regression from #21406 #21406 (comment). This should be changed to:
const roomName = ReportUtils.getReportName(report);But if reportName prop already exists we can use it directly.
There was a problem hiding this comment.
Ok, great, thanks for the context. I will update it to use getReportName.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Details
Fixed Issues
$ #16583
PROPOSAL: #16583 (comment)
Tests
On Web/Desktop:
Offline tests
This feature can't test when offline
QA Steps
Same as Tests
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)myBool && <MyComponent />.src/languages/*files and using the translation methodWaiting for Copylabel for a copy review on the original GH to get the correct copy.STYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)/** comment above it */thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor)thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG))Avataris modified, I verified thatAvataris working as expected in all cases)ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Web
Notification from a chat room
Notification from a normal chat
Mobile Web - Chrome
N/A
Mobile Web - Safari
N/A
Desktop
Notification from a chat room
Notification from a normal chat
iOS
N/A
Android
N/A